Bump version numbers for beta.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4142 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/configure b/gpsbabel/configure
index c0709eb97f9fa2b7862f9384aac12da145cc4df9..943b308080f494df16dbefbde7f2a551f499bfd1 100755 (executable)
--- a/gpsbabel/configure
+++ b/gpsbabel/configure
@@ -1749,9 +1749,9 @@ DOCVERSION=1.4.3
 
 
 # Increase GBBUILD for a new release
-GBBUILD=23
+GBBUILD=24
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20111112"
+PACKAGE_RELEASE="-beta20120114"
 # DOCVERSION=development
 
 cat >>confdefs.h <<_ACEOF

diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in
index 719f8dd6bcd006a840f9d4d475ebddf056bf668c..ee66d662eb795dcdbe08e066513dcfb1a57e4a32 100644 (file)
--- a/gpsbabel/configure.in
+++ b/gpsbabel/configure.in
@@ -11,9 +11,9 @@ DOCVERSION=1.4.3
 
 
 # Increase GBBUILD for a new release
-GBBUILD=23
+GBBUILD=24
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20111112"
+PACKAGE_RELEASE="-beta20120114"
 # DOCVERSION=development
 AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.])
 AC_SUBST(PACKAGE_RELEASE)

diff --git a/gpsbabel/gbversion.h b/gpsbabel/gbversion.h
index 4939b9ce8fc31a595e1ce5b8c5e2df37b0beb627..5cdc4c892ae05e4e87b98f9a94c1ff2e3b331376 100644 (file)
--- a/gpsbabel/gbversion.h
+++ b/gpsbabel/gbversion.h
@@ -4,5 +4,5 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.4.3-beta20111112"
+#define VERSION "1.4.3-beta20120114"
 #define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.4.3"

diff --git a/gpsbabel/gui/app.pro b/gpsbabel/gui/app.pro
index 9fc5b95ae2eaa0aa02217e7176c3ff21daad2872..b725446d3bd7207479ac1e58f435ea4c9a9a60d2 100755 (executable)
--- a/gpsbabel/gui/app.pro
+++ b/gpsbabel/gui/app.pro
@@ -4,9 +4,9 @@
 CONFIG += qt release 
 #CONFIG += qt debug console
 
-# For Mac, build Universal binary.   Ignored on other OSes.
-# QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-CONFIG -= x86 _64
+# For Mac, x86 and x64, but not PPC binary.   Ignored on other OSes.
+macx:CONFIG -= x86_64 
+# macx:CONFIG += x86
 
 ICON = images/appicon.icns
 

diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss
index 8b8c41446d8b9d2833a48ebace0d901aaf128bc7..40c9771938d6a721cb6b3583a4daea1dfda5e1b4 100755 (executable)
--- a/gpsbabel/gui/setup.iss
+++ b/gpsbabel/gui/setup.iss
@@ -16,7 +16,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
 AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017}\r
 AppName=GPSBabel\r
-AppVerName=GPSBabel 1.4.3-beta20111112\r
+AppVerName=GPSBabel 1.4.3-beta20120114\r
 AppPublisher=GPSBabel\r
 AppPublisherURL=http://www.gpsbabel.org\r
 AppSupportURL=http://www.gpsbabel.org\r
@@ -24,7 +24,7 @@ AppUpdatesURL=http://www.gpsbabel.org
 DefaultDirName={pf}\GPSBabel\r
 DefaultGroupName=GPSBabel\r
 OutputDir=release\r
-OutputBaseFilename=GPSBabel-1.4.3-beta20111112-Setup\r
+OutputBaseFilename=GPSBabel-1.4.3-beta20120114-Setup\r
 SetupIconFile=images\babel2.ico\r
 Compression=lzma\r
 SolidCompression=yes\r

diff --git a/gpsbabel/win32/gpsbabel.ico b/gpsbabel/win32/gpsbabel.ico
index 2773cc549ce5f7dd1a06594c7a407f8cc840d864..6e2b952b7eec1009f217b1850f7d4092ef5fcbdc 100644 (file)
Binary files a/gpsbabel/win32/gpsbabel.ico and b/gpsbabel/win32/gpsbabel.ico differ